From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 26 Feb 2010 08:13:02 +0000 (+0000)
Subject: x86_32: Fix build after 20983:94535cc63835
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12558
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=02ea486f8e0392fbe36e3869c2bb8021541d2cc1;p=xen.git

x86_32: Fix build after 20983:94535cc63835

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 2060ff78cc..b89c58805e 100644
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -114,6 +114,7 @@ static __init void bad_srat(void)
 		apicid_to_node[i] = NUMA_NO_NODE;
 }
 
+#ifdef CONFIG_X86_64
 /*
  * A lot of BIOS fill in 10 (= no distance) everywhere. This messes
  * up the NUMA heuristics which wants the local node to have a smaller
@@ -140,7 +141,6 @@ static __init int slit_valid(struct acpi_table_slit *slit)
 /* Callback for SLIT parsing */
 void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 {
-#ifdef CONFIG_X86_64
 	unsigned long mfn;
 	if (!slit_valid(slit)) {
 		printk(KERN_INFO "ACPI: SLIT table looks invalid. "
@@ -155,8 +155,12 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 	}
 	acpi_slit = mfn_to_virt(mfn);
 	memcpy(acpi_slit, slit, slit->header.length);
-#endif
 }
+#else
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+{
+}
+#endif
 
 /* Callback for Proximity Domain -> LAPIC mapping */
 void __init